Open
Conversation
* Added tooltip * Enabled search in comboboxes * Expired token now shown in red * Fixed SyncDialog auto-close * Made auto-deletion of obsolete mappings optional (Keep/Remove)
Death111
changed the base branch from
develop
to
feature/PTBAS-738_syncDialogAnpassungen
Base automatically changed from
feature/PTBAS-738_syncDialogAnpassungen
to
develop
October 23, 2025 16:06
# Conflicts: # src/main/java/de/doubleslash/keeptime/controller/HeimatController.java # src/main/java/de/doubleslash/keeptime/view/ExternalProjectsSyncController.java # src/main/java/de/doubleslash/keeptime/viewpopup/SearchCombobox.java # src/test/java/de/doubleslash/keeptime/controller/HeimatControllerTest.java
Death111
requested changes
Nov 3, 2025
src/main/java/de/doubleslash/keeptime/controller/HeimatController.java
Outdated
Show resolved
Hide resolved
src/test/java/de/doubleslash/keeptime/controller/HeimatControllerTest.java
Outdated
Show resolved
Hide resolved
src/main/java/de/doubleslash/keeptime/controller/HeimatController.java
Outdated
Show resolved
Hide resolved
src/main/java/de/doubleslash/keeptime/view/ExternalProjectsMapController.java
Show resolved
Hide resolved
Collaborator
|
in sync dialog times which exist in heimat but not in keeptime the projects are not shown in bold. might fix in this pr |
* improve test * improve expiration label * refactor code in ExternalProjectsMapController * fix work stacking when it is not needed
# Conflicts: # src/main/java/de/doubleslash/keeptime/controller/HeimatController.java # src/main/resources/layouts/externalProjectSync.fxml
* issue to reproduce via test was that the db ids are not set correctly in testsetup causing different behavior in tests
…able heimat tasks to logic
Death111
reviewed
Apr 6, 2026
src/main/java/de/doubleslash/keeptime/controller/HeimatController.java
Outdated
Show resolved
Hide resolved
src/main/java/de/doubleslash/keeptime/view/ExternalProjectsMapController.java
Show resolved
Hide resolved
Death111
reviewed
Apr 6, 2026
| // External Project column with dropdown | ||
| final ObservableList<HeimatTask> externalProjectsObservableList = FXCollections.observableArrayList( | ||
| externalProjects); | ||
| externalProjectsObservableList.add(0, null); // option to clear selection |
Collaborator
There was a problem hiding this comment.
todo check if we can readd this for easier selection
Collaborator
There was a problem hiding this comment.
not so easy...
but with current implementation one cannot remove a mapping (set no mapping). Need to add possibility to select
Death111
reviewed
Apr 6, 2026
src/main/java/de/doubleslash/keeptime/view/SettingsController.java
Outdated
Show resolved
Hide resolved
Death111
requested changes
Apr 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
mapping dialog
sync dialog
setting dialog